[Part3] Decouple ICD Management cluster to be code driven. #41499
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pullapprove
bot
added
review - pending
and removed
examples
app
examples chef
Contributor
There was a problem hiding this comment.
Pull Request Overview
The PR decouples the ICD Management cluster to be code driven by migrating from a ZAP/Ember-based implementation to a modern DefaultServerCluster approach. This transformation makes the cluster more maintainable and testable while aligning with the project's architectural goals.
Key changes:
- Converted from AttributeAccessInterface pattern to DefaultServerCluster
- Created separate ICDManagementCluster and ICDManagementClusterWithCIP classes for different feature sets
- Added comprehensive unit tests for cluster functionality
- Moved ClusterRevision from RAM-based storage to callback-based implementation
Reviewed Changes
Copilot reviewed 40 out of 40 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/app/clusters/icd-management-server/ICDManagementCluster.h | Redesigned class hierarchy with base ICDManagementCluster and CIP-enabled subclass |
| src/app/clusters/icd-management-server/ICDManagementCluster.cpp | Implemented new cluster logic with DefaultServerCluster pattern |
| src/app/clusters/icd-management-server/CodegenIntegration.cpp | Added integration layer for codegen cluster registration |
| src/app/clusters/icd-management-server/tests/TestICDManagementCluster.cpp | Added unit tests for cluster attributes and commands |
| zzz_generated/app-common/app-common/zap-generated/callback.h | Removed legacy command callbacks |
| zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h | Removed ClusterRevision accessor functions |
| examples/*.matter | Updated ClusterRevision from RAM to callback attribute across all examples |
7 tasks
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request effectively refactors the ICD Management cluster to be a code-driven implementation, which is a great improvement. The changes align well with the established patterns for code-driven clusters in this repository, including the addition of unit tests. The overall structure is clean and well-organized. I have a couple of minor suggestions to further improve code quality and test coverage.
src/app/clusters/icd-management-server/tests/TestICDManagementCluster.cpp
Outdated
Show resolved
Hide resolved
jadhavrohit924
changed the title
jadhavrohit924
force-pushed
the
icd_management/code
branch
from
2671e61 to
b66acf8
Compare
|
PR #41499: Size comparison from a95f163 to b66acf8 Increases above 0.2%:
Full report (37 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #41499 +/- ##
=======================================
Coverage 51.01% 51.02%
=======================================
Files 1386 1387 +1
Lines 100988 101054 +66
Branches 13081 13085 +4
=======================================
+ Hits 51519 51558 +39
- Misses 49469 49496 +27 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
bzbarsky-apple
requested changes
Oct 17, 2025
src/app/clusters/icd-management-server/tests/TestICDManagementCluster.cpp
Show resolved
Hide resolved
andy31415
reviewed
Oct 17, 2025
src/app/clusters/icd-management-server/ICDManagementCluster.cpp
Outdated
Show resolved
Hide resolved
src/app/clusters/icd-management-server/ICDManagementCluster.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Oct 27, 2025
andy31415
reviewed
Oct 27, 2025
andy31415
reviewed
Oct 27, 2025
src/app/clusters/icd-management-server/ICDManagementCluster.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Oct 27, 2025
andy31415
reviewed
Oct 27, 2025
src/app/clusters/icd-management-server/ICDManagementCluster.cpp
Outdated
Show resolved
Hide resolved
jadhavrohit924
force-pushed
the
icd_management/code
branch
from
6682fc8 to
c26b673
Compare
src/app/clusters/icd-management-server/tests/TestICDManagementCluster.cpp
Show resolved
Hide resolved
… storing to userActiveModeTriggerInstruction
jadhavrohit924
force-pushed
the
icd_management/code
branch
from
c26b673 to
94c3562
Compare
|
PR #41499: Size comparison from 79e4f9d to 94c3562 Full report (4 builds for cc32xx, realtek)
|
src/app/clusters/icd-management-server/tests/TestICDManagementCluster.cpp
Show resolved
Hide resolved
|
PR #41499: Size comparison from 79e4f9d to a785235 Full report (6 builds for cc32xx, nrfconnect, realtek, stm32)
|
|
PR #41499: Size comparison from 79e4f9d to 1f21fb9 Increases above 0.2%:
Full report (35 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
andy31415
approved these changes
Nov 10, 2025
marybadalyan
pushed a commit
to marybadalyan/connectedhomeip
that referenced
this pull request
Nov 11, 2025
…hip#41499) * Decouple ICD Management cluster to be code driven. * Add cluster to decoupled list. * Add codegen integration * Add unit tests * Zap regen * Restyler * Addressed review comments. * Fix CI * Refactor the cluster implementation. * Reorder member varible for memory holes, validated buffer size before storing to userActiveModeTriggerInstruction * Rebase and zap regen * Rebase * Zap regen * Address copilot review
bhmanda-silabs
pushed a commit
to bhmanda-silabs/connectedhomeip
that referenced
this pull request
Nov 14, 2025
…hip#41499) * Decouple ICD Management cluster to be code driven. * Add cluster to decoupled list. * Add codegen integration * Add unit tests * Zap regen * Restyler * Addressed review comments. * Fix CI * Refactor the cluster implementation. * Reorder member varible for memory holes, validated buffer size before storing to userActiveModeTriggerInstruction * Rebase and zap regen * Rebase * Zap regen * Address copilot review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Creates a DefaultServerCluster out of the ICD Management.
Related issues
Fixes: #40988
Testing
Readability checklist
The checklist below will help the reviewer finish PR review in time and keep the
code readable:
descriptive
“When in Rome…”
rule (coding style)
See: Pull Request Guidelines